From 0cd262a3d850d22262b4cdd68a12099c221b510c Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Tue, 15 Jul 2003 00:49:09 +0000 Subject: [PATCH] bitkeeper revision 1.352 (3f134f85YWnJ4PLqQ7YFm2Ydbnzh9Q) Only attempt to access keyboard if SIF_CONSOLE set on domain +typo fix --- xen/drivers/block/xen_block.c | 2 +- .../include/asm-xeno/keyboard.h | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/xen/drivers/block/xen_block.c b/xen/drivers/block/xen_block.c index 369cbfe463..dfacec0495 100644 --- a/xen/drivers/block/xen_block.c +++ b/xen/drivers/block/xen_block.c @@ -711,7 +711,7 @@ static void dispatch_rw_block_io(struct task_struct *p, int index) phys_seg[nr_psegs].dev = xendev_to_physdev(req->device); if ( phys_seg[nr_psegs].dev == 0 ) { - DPRINTK("bad device: %04x\n", req_device); + DPRINTK("bad device: %04x\n", req->device); goto bad_descriptor; } new_segs = 1; diff --git a/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h b/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h index 263aa595a1..e8a3905b7b 100644 --- a/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h +++ b/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h @@ -52,6 +52,19 @@ extern unsigned char pckbd_sysrq_xlate[128]; #include #include +#define kbd_controller_present xen_kbd_controller_present + +static inline int xen_kbd_controller_present () +{ + if( start_info.flags & SIF_CONSOLE ) + { + printk("Enable keyboard\n"); + return 1; + } + else + return 0; +} + /* resource allocation */ #define kbd_request_region() do { } while (0) #define kbd_request_irq(handler) request_irq(_EVENT_KBD, handler, 0, "PS/2 kbd", NULL) @@ -68,7 +81,7 @@ static unsigned char kbd_current_scancode = 0; static unsigned char kbd_read_input(void) { - //printk("kbd_read_input: returning scancode 0x%2x\n", kbd_current_scancode); + //xprintk("kbd_read_input: returning scancode 0x%2x\n", kbd_current_scancode); return kbd_current_scancode; } -- 2.30.2